Merge branch 'merge-places-sidebar'
authorFederico Mena Quintero <federico@gnome.org>
Tue, 16 Apr 2013 00:29:37 +0000 (19:29 -0500)
committerFederico Mena Quintero <federico@gnome.org>
Tue, 16 Apr 2013 00:29:37 +0000 (19:29 -0500)
commit3b3eb4bdbc90ee6df387ba8d8fe061f5956ca442
tree0733da2f4e168f1231f4d05c182e037682763ce9
parente3a22b3eba58b7dcb52496db893795f9f2d65983
parenta6f9ef0d3a9149c6e5582b5907ebc3085cffdfce
Merge branch 'merge-places-sidebar'

This is the new GtkPlacesSidebar widget, which is the sidebar used in
GtkFileChooser to display a list of places/folders that the user may
want to use.  File managers are encouraged to use this widget for
their own global list of folders.